projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: de8b2ec)
bitkeeper revision 1.1159.258.126 (4285cf9es4gAxAYMAVfDwAUWmO6-Lw)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 14 May 2005 10:14:54 +0000 (10:14 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 14 May 2005 10:14:54 +0000 (10:14 +0000)
Many files:
  Move - into XENGUEST so builds without XENGUEST work better.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
buildconfigs/mk.linux-2.4-xen0 patch | blob | history
buildconfigs/mk.linux-2.4-xenU patch | blob | history
buildconfigs/mk.linux-2.6-xen0 patch | blob | history
buildconfigs/mk.linux-2.6-xenU patch | blob | history
linux-2.4.29-xen-sparse/arch/xen/Makefile patch | blob | history
linux-2.6.11-xen-sparse/arch/xen/Makefile patch | blob | history

diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index 7a735b517d7a932e6d2928277d9d1640aa11cd00..aa10295f05b7e24eb71993b8d10a47f7ff4bbe9e 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -32,7 +32,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # add ebtables patch
        ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index 256873e6fccd5e5a0f02f96e89c70b1afbf586d5..8e441c723785006eb72f76efe272f0a83a68b4f8 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 088330a657131c826e79aee5915ae933a39eb751..08d40637915161ca8f929b0b326d1836b8aad955 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 7b2c7e291efcb0951b55f6a5de3dd230b21e5f6a..7a3951cd9204855dbf5b384d2526a7933c747fa3 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
diff --git a/linux-2.4.29-xen-sparse/arch/xen/Makefile b/linux-2.4.29-xen-sparse/arch/xen/Makefile
index c8cf8cd6e8bfbe12e5cac76a12ea710296229371..e8e161a3957547abe6bf2b154d2b3cc6007044dd 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile
@@ -113,13 +113,13 @@ bzImage: vmlinux
 INSTALL_NAME ?= $(KERNELRELEASE)
 install: bzImage
        mkdir -p $(INSTALL_PATH)/boot
-       ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
        rm -f $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 arch/$(ARCH)/boot/bzImage $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
-       ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
 
 %_config: arch/xen/defconfig-%
        rm -f .config arch/xen/defconfig
diff --git a/linux-2.6.11-xen-sparse/arch/xen/Makefile b/linux-2.6.11-xen-sparse/arch/xen/Makefile
index c67ff0c3d62b5562a68986b1f3497b609fd18ec6..4f7718b6069462886e1c54fe5d5afafc9e66514f 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile
@@ -48,13 +48,13 @@ vmlinuz: vmlinux
 XINSTALL_NAME ?= $(KERNELRELEASE)
 install: vmlinuz
        mkdir -p $(INSTALL_PATH)/boot
-       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
        rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
        mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
        install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
 
Unnamed repository; edit this file 'description' to name the repository.